Skip to content

Conversation

Mark-Simulacrum
Copy link
Member

This includes a backport of #51235 which fixes #51117 on stable. It has not been tested.

r? @nikomatsakis since the backport was not clean.
cc @rust-lang/core @rust-lang/release

@rust-highfive
Copy link
Contributor

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against stable. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 31, 2018
@eddyb
Copy link
Member

eddyb commented May 31, 2018

Do we want to also get #51051 in? Are there any other "quick fixes" we might be forgetting?

@kennytm kennytm added T-core Relevant to the core team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. labels May 31, 2018
@pietroalbini
Copy link
Member

@eddyb #51051 was already included in 1.26.1 :)

@rust-highfive

This comment has been minimized.

@eddyb
Copy link
Member

eddyb commented May 31, 2018

@pietroalbini Ah it seems that was done without backporting it to beta in the first place?

@pietroalbini
Copy link
Member

@eddyb yeah, it seems so (that PR is still waiting in the backports PR). By the way, #51235 is also not backported into beta (it needs to be approved).

@nikomatsakis
Copy link
Contributor

There is also #51274, but @eddyb hasn't even reviewed it yet. There is no particular reason to backport it other than that it fixes an unsoundness.

nikomatsakis and others added 3 commits June 1, 2018 12:41
`PointerKind` is included in `LoanPath` and hence forms part of the
equality check; this led to having two unequal paths that both
represent `*x`, depending on whether the `*` was inserted
automatically or explicitly. Bad mojo. The `note` field, in contrast,
is intended more-or-less primarily for this purpose of adding extra
data.
@Mark-Simulacrum
Copy link
Member Author

@bors r=nikomatsakis p=300 (stable artifacts)

@bors
Copy link
Collaborator

bors commented Jun 1, 2018

📌 Commit 7093b11 has been approved by nikomatsakis

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 1, 2018
@bors
Copy link
Collaborator

bors commented Jun 1, 2018

⌛ Testing commit 7093b11 with merge 594fb25...

bors added a commit that referenced this pull request Jun 1, 2018
1.26.2 release

This includes a backport of #51235 which fixes #51117 on stable. It has not been tested.

r? @nikomatsakis since the backport was not clean.
cc @rust-lang/core @rust-lang/release
@bors
Copy link
Collaborator

bors commented Jun 1, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 594fb25 to stable...

@bors bors merged commit 7093b11 into rust-lang:stable Jun 1, 2018
@Mark-Simulacrum Mark-Simulacrum deleted the stable-next branch June 1, 2018 23:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-core Relevant to the core team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants